From 5bf1aafdce936116a8aee957c14397b2f2ba7211 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sat, 14 Oct 2017 14:36:10 -0400 Subject: [PATCH] Switch from cdbs to dh --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 4 +--- debian/rules | 35 +++++++++++++++++++++-------------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 817169c..914f8c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ babl (0.1.34-1) UNRELEASED; urgency=medium * New upstream release + * Switch from cdbs to dh -- Jeremy Bicha Sat, 14 Oct 2017 14:10:57 -0400 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 2c705aa..337b0a8 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,7 @@ Source: babl Section: libs Priority: optional Maintainer: Debian QA Group -Build-Depends: dh-autoreconf, - cdbs (>= 0.4.93~), - debhelper (>= 9), +Build-Depends: debhelper (>= 10), gobject-introspection, libgirepository1.0-dev, pkg-config diff --git a/debian/rules b/debian/rules index 36afcd5..b32f73f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,7 @@ #!/usr/bin/make -f +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk - -export LDFLAGS += -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed # Disable SSE2 except on amd64 ifneq ($(DEB_HOST_ARCH_CPU),amd64) @@ -14,12 +10,23 @@ else sse_flags := --enable-mmx --enable-sse --enable-sse2 endif -DEB_CONFIGURE_EXTRA_FLAGS += \ ---libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - $(sse_flags) \ - --disable-sse4_1 \ - --disable-f16c +%: + dh $@ + +override_dh_autoreconf: + dh_autoreconf --as-needed + +override_dh_auto_configure: + dh_auto_configure -- \ + $(sse_flags) \ + --disable-sse4_1 \ + --disable-f16c + +override_dh_install: + dh_install --list-missing + +override_dh_makeshlibs: + dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/babl-0.1/ -V -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libbabl-0.1-0 = "--exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/babl-0.1" -DEB_DH_INSTALLDOCS_ARGS_libbabl-0.1-doc = "--exclude=Makefile" -DEB_DH_INSTALL_ARGS += --list-missing +override_dh_installdocs: + dh_installdocs -XMakefile -- 2.30.2